From: Kenichi Handa <handa@m17n.org>
Date: Thu, 2 Feb 2012 00:32:12 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~733^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=cbd2c60ff0605f7309d9fc3e48fc8a4d938515aa;p=emacs.git

merge trunk
---

cbd2c60ff0605f7309d9fc3e48fc8a4d938515aa
diff --cc lisp/ChangeLog
index 487c1c342eb,14cf8b54088..93a6a410777
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,27 +1,32 @@@
- 2012-02-01  Kenichi Handa  <handa@m17n.org>
++2012-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +	* composite.el (compose-region, compose-string): Signal error for
 +	a null string component (Bug#6988).
 +
+ 2012-02-01  Chong Yidong  <cyd@gnu.org>
+ 
+ 	* view.el (view-buffer-other-window, view-buffer-other-frame):
+ 	Handle special modes like view-buffer (Bug#10650).
+ 	(view-buffer): Simplify.
+ 
+ 	* frame.el (set-frame-font): Tweak meaning of third argument.
+ 
+ 	* dynamic-setting.el (font-setting-change-default-font): Use
+ 	set-frame-font (Bug#9982).
+ 
+ 2012-02-01  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* progmodes/compile.el (compilation-internal-error-properties):
+ 	Respect compilation-first-column in the "*compilation*" buffer.
+ 
+ 	* emacs-lisp/easy-mmode.el (define-minor-mode):
+ 	Relax :variable's test for a named function.
+ 
+ 2012-01-31  Alan Mackenzie  <acm@muc.de>
+ 
+ 	* progmodes/cc-engine.el (c-guess-basic-syntax): CASE 5B.1: Fix an
+ 	off by one error.
+ 
  2012-01-31  Chong Yidong  <cyd@gnu.org>
  
  	* frame.el (set-frame-font): New arg ALL-FRAMES.
diff --cc src/ChangeLog
index af0024284c2,d8e7ecce36e..004215b222b
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,10 -1,10 +1,17 @@@
- 2012-02-01  Kenichi Handa  <handa@m17n.org>
++2012-02-02  Kenichi Handa  <handa@m17n.org>
 +
 +	* xdisp.c (BUILD_COMPOSITE_GLYPH_STRING): Initialize first_s to
 +	NULL (Bug#6988).
 +	(x_produce_glyphs): If the component of a composition is a null
 +	string, set it->pixel_width to 1 to avoid zero-width glyph.
 +
+ 2012-02-01  Eli Zaretskii  <eliz@gnu.org>
+ 
+ 	* ralloc.c (resize_bloc, r_alloc_sbrk): Don't call memmove if its
+ 	first 2 arguments are identical.  This makes inserting large
+ 	output from a subprocess an order of magnitude faster on
+ 	MS-Windows, where all sbrk'ed memory is always contiguous.
+ 
  2012-01-31  Glenn Morris  <rgm@gnu.org>
  
  	* nsterm.m (syms_of_nsterm) <x-toolkit-scroll-bars>: